Auto merge of #2003 - cesarb:issue-587, r=alexcrichton
authorbors <bors@rust-lang.org>
Sat, 26 Sep 2015 18:03:39 +0000 (18:03 +0000)
committerbors <bors@rust-lang.org>
Sat, 26 Sep 2015 18:03:39 +0000 (18:03 +0000)
Based on rust's mk/reconfig.mk

Fixes #587 and #1993


Trivial merge